Merge git://git.denx.de/u-boot-mmc
authorTom Rini <[email protected]>
Mon, 15 Jan 2018 03:26:38 +0000 (22:26 -0500)
committerTom Rini <[email protected]>
Mon, 15 Jan 2018 03:26:38 +0000 (22:26 -0500)

Trivial merge